Remove options and question types

Ready to merge