Remove accidental subprojects

Change-Id: I868144dc4b9f5f1b650624d64dc528b0cab0b774