Updated Utils to remove the Popupwindow stuff