demo
cleanup
removed demo hacks