deleted some legacy code