housekeeping. removing deprecated code