Removed all the deprecated code