Project cleanup, includes