updated unit conversions and removed unused