Removed unused classes + question->quiz