Remove unneeded checks
Fix leaking location listener