removes hacks from previous commit