Removed deprecated code from core