project cleanup
more project cleanup