clearing the dead code and useless comments