CLEAN: remove deprecated code