Project cleanup v1