[FIX] removed unneeded code

remove code that was reintroduced by mistake
also change popover delays so popover will hide
earlier than next popover shows
Merge pull request #1817 from darkdarkdragon/develop-fix-addresspopover

[FIX] remove unneeded code