Remove unneeded checks from listeners