huge clean up

Change-Id: I592b23680cb31f446259b7f697a0527f1b8965a6