Remove redundant safeUnit() calls