REFACTORING: remove deprecated code