Use correct function when unubscribing, we were leaking eventlisteners