upgrade to hydro and cleanup