Removed @discussion tags from docs

There were quite a few instances of `@discussion` in the documentation, which is not supported. They have been removed. Also, since order matters, some of the comments were moved to their correct spots so they generate correctly.