Remove excess type guards