diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsLogger.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsLogger.java
index 7483b4100bf..40d7c54fcfa 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsLogger.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsLogger.java
@@ -10,10 +10,10 @@ import org.eclipse.core.runtime.Status;
 @Deprecated
 public class LanguageSettingsLogger {
 
-	/**
-	 * 
-	 */
-	private static final boolean ENABLED = false;
+	public static boolean isEnabled() {
+		return false;
+//		return true;
+	}
 
 	// AG FIXME
 	/**
@@ -22,7 +22,7 @@ public class LanguageSettingsLogger {
 	 */
 	@Deprecated
 	public static void logInfo(String msg) {
-		if (ENABLED) {
+		if (isEnabled()) {
 			Exception e = new Exception(msg);
 			IStatus status = new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, msg, e);
 			CCorePlugin.log(status);
@@ -36,7 +36,7 @@ public class LanguageSettingsLogger {
 	 */
 	@Deprecated
 	public static void logWarning(String msg) {
-		if (ENABLED) {
+		if (isEnabled()) {
 			Exception e = new Exception(msg);
 			IStatus status = new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, msg, e);
 			CCorePlugin.log(status);
@@ -50,7 +50,7 @@ public class LanguageSettingsLogger {
 	 */
 	@Deprecated
 	public static void logError(String msg) {
-		if (ENABLED) {
+		if (isEnabled()) {
 			Exception e = new Exception(msg);
 			IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, msg, e);
 			CCorePlugin.log(status);
@@ -65,7 +65,7 @@ public class LanguageSettingsLogger {
 	 */
 	@Deprecated
 	public static void logScannerInfoProvider(IResource rc, Object who) {
-		if (ENABLED) {
+		if (isEnabled()) {
 			String msg = "rc="+rc+" <-- "+who.getClass().getSimpleName();
 			if (rc instanceof IFile) {
 				LanguageSettingsLogger.logInfo(msg);
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
index fc227899852..5a5184c243d 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
@@ -98,16 +98,19 @@ public class LanguageSettingsProvidersSerializer {
 			providerId = id;
 		}
 
+		@Override
 		public String getId() {
 			return providerId;
 		}
 
+		@Override
 		public String getName() {
 			ILanguageSettingsProvider rawProvider = getRawProvider();
 			String name = rawProvider!=null ? rawProvider.getName() : null;
 			return name;
 		}
 
+		@Override
 		public List<ICLanguageSettingEntry> getSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId) {
 			ILanguageSettingsProvider rawProvider = getRawProvider();
 			List<ICLanguageSettingEntry> entries = rawProvider!=null ? rawProvider.getSettingEntries(cfgDescription, rc, languageId) : null;
@@ -157,6 +160,7 @@ public class LanguageSettingsProvidersSerializer {
 			return projectCount;
 		}
 		
+		@Override
 		public void registerListener(ICConfigurationDescription cfgDescription) {
 			// keep in mind that rawProvider can change
 			ILanguageSettingsProvider rawProvider = getRawProvider();
@@ -165,6 +169,7 @@ public class LanguageSettingsProvidersSerializer {
 			}
 		}
 
+		@Override
 		public void unregisterListener() {
 			// keep in mind that rawProvider can change
 			ILanguageSettingsProvider rawProvider = getRawProvider();
@@ -212,10 +217,12 @@ public class LanguageSettingsProvidersSerializer {
 			}
 		}
 
+		@Override
 		public String getProjectName() {
 			return projectName;
 		}
 
+		@Override
 		public String[] getConfigurationDescriptionIds() {
 			return deltaMap.keySet().toArray(new String[deltaMap.size()]);
 		}
@@ -363,9 +370,7 @@ projects:
 	}
 
 	public static void serializeLanguageSettingsWorkspace() throws CoreException {
-		// AG TODO - remove the log
-		CCorePlugin.log(new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, IStatus.OK,
-				"LanguageSettingsProvidersSerializer.serializeLanguageSettingsWorkspace()", new Exception()));
+		LanguageSettingsLogger.logWarning("LanguageSettingsProvidersSerializer.serializeLanguageSettingsWorkspace()");
 		
 		URI uriStoreWsp = getStoreInWorkspaceArea(STORAGE_WORKSPACE_LANGUAGE_SETTINGS);
 		List<LanguageSettingsSerializable> serializableWorkspaceProviders = new ArrayList<LanguageSettingsSerializable>();
@@ -528,9 +533,7 @@ projects:
 
 	public static void serializeLanguageSettings(ICProjectDescription prjDescription) throws CoreException {
 		IProject project = prjDescription.getProject();
-		// AG TODO - remove the log
-		CCorePlugin.log(new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, IStatus.OK,
-				"LanguageSettingsProvidersSerializer.serializeLanguageSettings() for " + project, new Exception()));
+		LanguageSettingsLogger.logWarning("LanguageSettingsProvidersSerializer.serializeLanguageSettings() for " + project);
 		
 		try {
 			// Document to store in project area
@@ -1010,9 +1013,7 @@ projects:
 	 * @param event the ILanguageSettingsChangeEvent event to be broadcast.
 	 */
 	public static void notifyLanguageSettingsChangeListeners(ILanguageSettingsChangeEvent event) {
-		// AG TODO - remove the log
-		CCorePlugin.log(new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, IStatus.OK,
-				"Firing " + event, new Exception()));
+		LanguageSettingsLogger.logWarning("Firing " + event);
 
 		Object[] listeners = fLanguageSettingsChangeListeners.getListeners();
 		for (Object obj : listeners) {
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
index 7ed1807860f..d34a52176b3 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
@@ -50,8 +50,8 @@ import org.eclipse.osgi.util.NLS;
 public class LanguageSettingsScannerInfoProvider implements IScannerInfoProvider {
 	private static final ExtendedScannerInfo DUMMY_SCANNER_INFO = new ExtendedScannerInfo();
 
+	@Override
 	public ExtendedScannerInfo getScannerInformation(IResource rc) {
-		// AG FIXME
 		LanguageSettingsLogger.logScannerInfoProvider(rc, this);
 		
 		IProject project = rc.getProject();
@@ -250,10 +250,12 @@ public class LanguageSettingsScannerInfoProvider implements IScannerInfoProvider
 		return (flags & bit) == bit;
 	}
 
+	@Override
 	public void subscribe(IResource resource, IScannerInfoChangeListener listener) {
 		// Handled by ScannerInfoProviderProxy for the moment
 	}
 
+	@Override
 	public void unsubscribe(IResource resource, IScannerInfoChangeListener listener) {
 		// Handled by ScannerInfoProviderProxy for the moment
 	}