Removing ndarray conversions to keep input units