Clean up some stuff

Change-Id: I7fde02f74053c75ad13c5b72371f47e6e7df7ac6