Removing aggregate projects, since we won't use them
Merge branch 'remove-aggregate-project'