clean up dead code && useless comments