Remove unnecessary wrapping