Removed some deprecated code in core.py