clean up dead code and etc.