minor cleanup for demo scene