Removed some legacy code