clean up
clean up
clear has some problem, need to fix