Removed some no longer needed hacks