Removed unnecessary wrapper overrides