diff --git a/ide/frames/backup_options.pas b/ide/frames/backup_options.pas
index 2002cefd27..5ed4d63bc1 100644
--- a/ide/frames/backup_options.pas
+++ b/ide/frames/backup_options.pas
@@ -56,8 +56,6 @@ type
     BackupOtherGroupLabel:TLabel;
     procedure BakTypeRadioGroupClick(Sender: TObject);
   private
-    fLoaded: Boolean;
-    FSaved: Boolean;
   public
     function GetTitle: String; override;
     procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@@ -206,8 +204,6 @@ end;
 
 procedure TBackupOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   with AOptions as TEnvironmentOptions do
   begin
     with BackupInfoProjectFiles do
@@ -257,8 +253,6 @@ end;
 
 procedure TBackupOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   with AOptions as TEnvironmentOptions do 
   begin
     with BackupInfoProjectFiles do
diff --git a/ide/frames/buildmodeseditor.pas b/ide/frames/buildmodeseditor.pas
index 3a88e6cb5c..24077d9339 100644
--- a/ide/frames/buildmodeseditor.pas
+++ b/ide/frames/buildmodeseditor.pas
@@ -72,11 +72,9 @@ type
     procedure BuildModesStringGridValidateEntry(sender: TObject; aCol,
       aRow: Integer; const OldValue: string; var NewValue: String);
   private
-    fLoaded: Boolean;
     FLoadShowSessionFromProject: boolean;
     FMacroValues: TProjectBuildMacros;
     FProject: TProject;
-    FSaved: Boolean;
     FShowSession: boolean;
     FSwitchingMode: boolean;
     fModeActiveCol: integer;
@@ -726,9 +724,6 @@ procedure TBuildModesEditorFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 var
   PCOptions: TProjectCompilerOptions;
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
-
   //debugln(['TBuildModesEditorFrame.ReadSettings ',DbgSName(AOptions)]);
   if AOptions is TProjectCompilerOptions then begin
     PCOptions:=TProjectCompilerOptions(AOptions);
@@ -751,8 +746,6 @@ end;
 
 procedure TBuildModesEditorFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   if AOptions is TProjectCompilerOptions then begin
     SaveMacros(false);
   end;
diff --git a/ide/frames/codeexplorer_update_options.pas b/ide/frames/codeexplorer_update_options.pas
index cabd10a1dc..d49c37e21d 100644
--- a/ide/frames/codeexplorer_update_options.pas
+++ b/ide/frames/codeexplorer_update_options.pas
@@ -37,8 +37,6 @@ type
     ModeRadioGroup: TRadioGroup;
     RefreshRadioGroup: TRadioGroup;
   private
-    fLoaded: Boolean;
-    FSaved: Boolean;
     { private declarations }
   public
     function GetTitle: String; override;
@@ -83,8 +81,6 @@ end;
 procedure TCodeExplorerUpdateOptionsFrame.ReadSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   with AOptions as TCodeExplorerOptions do
   begin
     case Refresh of
@@ -109,8 +105,6 @@ end;
 procedure TCodeExplorerUpdateOptionsFrame.WriteSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   with AOptions as TCodeExplorerOptions do
   begin
     case RefreshRadioGroup.ItemIndex of
diff --git a/ide/frames/codetools_codecreation_options.pas b/ide/frames/codetools_codecreation_options.pas
index 6fcbc8f986..33e7ca46b6 100644
--- a/ide/frames/codetools_codecreation_options.pas
+++ b/ide/frames/codetools_codecreation_options.pas
@@ -37,8 +37,6 @@ type
     ForwardProcsKeepOrderCheckBox: TCheckBox;
     UsesInsertPolicyRadioGroup: TRadioGroup;
   private
-    fLoaded: Boolean;
-    FSaved: Boolean;
   public
     function GetTitle: String; override;
     procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@@ -92,8 +90,6 @@ end;
 procedure TCodetoolsCodeCreationOptionsFrame.ReadSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   with AOptions as TCodetoolsOptions do
   begin
     case ForwardProcBodyInsertPolicy of
@@ -121,8 +117,6 @@ end;
 procedure TCodetoolsCodeCreationOptionsFrame.WriteSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   with AOptions as TCodetoolsOptions do
   begin
     case ForwardProcsInsertPolicyRadioGroup.ItemIndex of
diff --git a/ide/frames/codetools_general_options.pas b/ide/frames/codetools_general_options.pas
index 2bbb18f233..ab68131ecd 100644
--- a/ide/frames/codetools_general_options.pas
+++ b/ide/frames/codetools_general_options.pas
@@ -60,8 +60,6 @@ type
     procedure SrcPathButtonClick(Sender: TObject);
   private
     FDialog: TAbstractOptionsEditorDialog;
-    fLoaded: Boolean;
-    FSaved: Boolean;
     procedure VisualizeIndentEnabled;
   public
     function GetTitle: String; override;
@@ -181,8 +179,6 @@ end;
 procedure TCodetoolsGeneralOptionsFrame.ReadSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   with AOptions as TCodeToolsOptions do
   begin
     SrcPathEdit.Text := SrcPath;
@@ -201,8 +197,6 @@ end;
 procedure TCodetoolsGeneralOptionsFrame.WriteSettings(
   AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   with AOptions as TCodeToolsOptions do
   begin
     SrcPath := SrcPathEdit.Text;
diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas
index 62359d08e9..0c4e38c49b 100644
--- a/ide/frames/compiler_buildmacro_options.pas
+++ b/ide/frames/compiler_buildmacro_options.pas
@@ -105,9 +105,7 @@ type
     FBuildMacros: TIDEBuildMacros;
     FIdleConnected: Boolean;
     FIsPackage: boolean;
-    fLoaded: Boolean;
     FMacrosOwner: TObject;
-    FSaved: Boolean;
     FStatusMessage: string;
     fVarImgID: LongInt;
     fValueImgID: LongInt;
@@ -1015,8 +1013,6 @@ end;
 
 procedure TCompOptBuildMacrosFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   if AOptions is TBaseCompilerOptions then
     LoadFromOptions(TBaseCompilerOptions(AOptions));
 end;
@@ -1032,8 +1028,6 @@ end;
 
 procedure TCompOptBuildMacrosFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   if AOptions is TBaseCompilerOptions then
     SaveToOptions(TBaseCompilerOptions(AOptions));
 end;
diff --git a/ide/frames/editor_markup_options.pas b/ide/frames/editor_markup_options.pas
index 3c96514691..107e0d0427 100644
--- a/ide/frames/editor_markup_options.pas
+++ b/ide/frames/editor_markup_options.pas
@@ -65,8 +65,6 @@ type
   private
     { private declarations }
     FDialog: TAbstractOptionsEditorDialog;
-    fLoaded: Boolean;
-    FSaved: Boolean;
   public
     function GetTitle: String; override;
     procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@@ -201,9 +199,6 @@ end;
 
 procedure TEditorMarkupOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
-
   with AOptions as TEditorOptions do
   begin
     MarkupWordTimeTrackBar.Position := MarkupCurWordTime;
@@ -225,9 +220,6 @@ end;
 
 procedure TEditorMarkupOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
-
   with AOptions as TEditorOptions do
   begin
     MarkupCurWordTime := MarkupWordTimeTrackBar.Position;
diff --git a/ide/frames/files_options.pas b/ide/frames/files_options.pas
index 8093f9a790..9002cc2a10 100644
--- a/ide/frames/files_options.pas
+++ b/ide/frames/files_options.pas
@@ -64,13 +64,11 @@ type
     procedure DirectoriesButtonClick(Sender: TObject);
     procedure ShowCompileDialogCheckBoxChange(Sender: TObject);
   private
-    fLoaded: Boolean;
     FOldLazarusDir: string;
     FOldCompilerFilename: string;
     FOldFPCSourceDir: string;
     FOldMakeFilename: string;
     FOldTestDir: string;
-    FSaved: Boolean;
     function CheckLazarusDir: boolean;
     function IsFPCSourceDir: boolean;
     function CheckTestDir: boolean;
@@ -272,8 +270,6 @@ end;
 
 procedure TFilesOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   with AOptions as TEnvironmentOptions do
   begin
     LazarusDirComboBox.Items.Assign(LazarusDirHistory);
@@ -314,8 +310,6 @@ end;
 
 procedure TFilesOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  if FSaved then exit;
-  FSaved:=true;
   with AOptions as TEnvironmentOptions do
   begin
     LazarusDirectory:=LazarusDirComboBox.Text;
diff --git a/ide/frames/project_forms_options.pas b/ide/frames/project_forms_options.pas
index b799711d98..c2bf173e7f 100644
--- a/ide/frames/project_forms_options.pas
+++ b/ide/frames/project_forms_options.pas
@@ -29,8 +29,6 @@ type
     procedure FormsMoveAutoCreatedFormUpBtnClick(Sender: TObject);
     procedure FormsRemoveFromAutoCreatedFormsBtnClick(Sender: TObject);
   private
-    fLoaded: Boolean;
-    FSaved: Boolean;
     function FirstAutoCreateFormSelected: Integer;
     function FirstAvailFormSelected: Integer;
     procedure SelectOnlyThisAutoCreateForm(Index: integer);
@@ -259,8 +257,6 @@ var
   end;
 
 begin
-  if fLoaded then exit;
-  fLoaded:=true;
   FillAutoCreateFormsListbox;
   FillAvailFormsListBox;
 
@@ -271,8 +267,6 @@ procedure TProjectFormsOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions)
 var
   Project: TProject absolute AOptions;
 begin
-  if FSaved then exit;
-  FSaved:=true;
   Project.AutoCreateForms := FormsAutoCreateNewFormsCheckBox.Checked;
   Project.TmpAutoCreatedForms := FormsAutoCreatedListBox.Items;
 end;