Remove some legacy hacks