Remove some wrappers