Major cleanup

Change-Id: I37cf09962df83d8e52d9442a742b443b1b3cc9e6