JsHint warnings

Useless changes, remove trailing whitespace and some semicolons
Remove wild card listeners

There might be cases when a wildcard listener is not removed due to premature returning.