clean up deprecated code.