[Core] - Removed more old code