[Core] Some clutter removed