Audit and Cleanup for Existing System