[Users] GRHydro cleanup