Removes deprecated code and logging