Hacking cleanup