✗cleanup. clean.

(Code-reviewer:UNAPPROVED FORCE CHECK IN now. http://code.open42.com/11409004)