Remove some legacy code from the core loop.