Deprecated code cleanup