[FIX] remove unneeded code

remove code that was reintroduced by mistake
also change popover delays so popover will hide
earlier than next popover shows