Fixed some comments, removed dead code