Reroute

Code cleanup & revert to server-side parsing.