Extract Skybox, some cleanup