add single/multiple choice code, remove unused modules