Some cleanup
Probably fixed 3D