added all questions and removed dead code