Remove more deprecation warnings
Merge pull request #602 from projecthydra/more_deprecations

Remove more deprecation warnings