Removed dependency on excel_hw_iface
Merge branch 'hydro' into excel_description