Remove unnecessary state