Remove unneeded calls to with