Lines 242 and 269 have the same code.  Does it have to be removed there as well?  I also need to make sure that this doesn't break anything else (SceneModePicker for instances).