Clean up Interceptor API