added branch hydro-devel
file clean up