Remove term-hacking