cleaned up deprecations