Remove unnecessary wrappers