[Core] Even More tab cleanup