remove our hacks - gtfo, normalize