removed other shims as the claim is I don't need them