Refactor: remove deprecated code