Removing more clustering stuff from project