Clean up popin and remove some console log