Delete old stuff

This PR removes deprecated methods and shim classes we no longer need.