tidy up

Removed duplicate popup.js and unused baseurl var