[3.0] Removed some old hacks