removed some legacy code