Cleanup: I'm still here

Change-Id: I94b037ea899d19935ad925ba8101cfb2d9ffdfc9