more demo scene cleanup