CODE: Remove deprecated code