Get rid of popup code