Giving up on the popup, trying to fix other bugs now by first cleaning up unnecessary bits