Remove ServerShim changes