Removed some changes
Removed all differences from hydro-devel except comments