Project cleanup #2