Remove wrappers that never worked quite right.