Added comment and removed dead code