Significantly cleaned up scene