Remove some duplicate questions and reorder them slightly