Remove popup routes (Closes #18)