took out some deprecated code