Post Effect work, project cleanup