remove test code.
enhance performance.