Further remove 3D support