cleanup dependencies
Merge branch 'hydro_dev' into velocity_interface_controller