A few popup modifications

Getting rid of popup stuff that we're not using.