Removed unneeded checks from the security listener