remove obsolete hacks