Removing endpoint dependency