took out some legacy code again