Get rid of sub-project, and silliness