working on V1.3
remove some unused code