removing dead code lines and excess comments