Removed all the DemoController code