[Core] Minor cleanup