Finished removal of Popups.java