Clean up a bit of legacy code.