Core: Removed some deprecated code