More cleanups in Core (3)