minor cleanup before removing scene definition
Merge branch 'master' of https://github.com/va3c/RvtVa3c