[Core] Cleanups after recent updates