removed more demo codes