Option removing should work now.
Merge branch 'master' into scenes