Final clean up

Test Plan:
<see below>