0618 fix and delete

fix some bugs and delete some useless filess
but there are still some bug inside