1. remove unused code
2. add timer for test