Removed all deprecated code that had alternatives