Major cleanup

Change-Id: Ib0b5c7a1446ed3c80f7ca89c91bec1ba9ff8867a