removing non-shippable code