removed demo cruft