Some cleanup, plus temporarily redirect default traffic to V1 web client