Remove remainder of hacky popup solution