Remove unnecessary unwrapping