Cleaning up scenes and removing some unused code.