Cleanup hacks now that reload works properly