Remove some stuff we dont have yet.

Change-Id: I212a7f8a301fa807723ba7047d0385e2a577a300