Removing old server-side handling.  -> .