code cleanup scenes
merge conflict