Major Cleanup

Change-Id: Idd84d6524dc22d0ad73735e1ff174965c7245570