Remove some server-side cruft