Code cleanup
Demo form is removed