Removing dead code on new interceptor