Few small changes, Demoer interface is gone