Remove unnecessary double-calc