Removed more deprecated code