Remove references to plans from origin-server