Removing deprecations

Drive-by cleanups