Project cleanup take2 :)