Remove any dependencies on SI units