Removed code that shouldn't be in the core