Cleanups for hydro release