Remove Deprecated code