Project cleanup

Project cleanup