Code formatting
Remove deprecated commands for Hydro
More Deprecation fixes