Removed unneeded eventlistnere