Remove non-shippable-compatible code