Deprecations

Deprecation changes from PR27