Revoging deprecations

Drive-by cleanups