Clean up demo, easier binding/unbinding with bindState