project cleanup and fix