General cleanup

Change-Id: I013e6f274686a27e44c1c414c8849be4da5daeff