Remove unnecessary state classes