Remove obsolete hacks