Removed unused options and added all options to settings.xml