Update, Removed some deprecated code