more "cleaning" of Core