Removed remaining deprecated code