Remove now unused parts of the interceptor classes and finish up the
test coverage.