Cleaned up demo scene some more.