Simplify the code, remove the interceptor