Comments

And removing unused code