removed map and set choice classes