Modified demo1 and cleaned the other demos