Discorick/query params refactors

Removes query params from URL's where they are unwanted or uneeded.