Removed some legacy code.