Move old functions out of Core.