More cleanups in Core (2)