refactoring started: deprecated code deleted