Clean up for now

We're tying to sort out some problems right now and will re-add them
once we figure out a solution.

Change-Id: I0595650518a823a4ce75558762adbaa90287122f
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>