Remove interceptor logic for now. Will add soon with API.