martji
all
1. delete unusefule code
2. code merge