Re-building the scene. Hopefully, things'll stay cleaned up too? Only time will tell.
Merge remote-tracking branch 'refs/remotes/origin/master'