clean up my sloppy cleanup

Change-Id: Ide01b90a14d0726450b39fba761d20bc6f8bb91a