remove unused choice class