Removed several deprecated code