Cleanup of interceptor code