skybox cleanups