remove unnecessary state fetch