Remove duplicate popup code

Fix for #134