Some code cleanup in the popup.
Remove some pointless code in popup since marquee has been refactored.