remove unused imports
fixed coupling of state labels to issue state