Hydro cleanup
;-(