Removed some deprecated code.