[gbrainy] Remove unused usings

[Jordi Mas <jmas src gnome org>]

commit 4e7ea54bf5ae862d5b1836e78a4eb325ce6a66e0
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Oct 8 19:58:48 2011 +0200

    Remove unused usings

 src/Clients/Classical/Dialogs/PdfExportDialog.cs   |    1 -
 src/Core/Libraries/TranslationsCatalog.cs          |    1 -
 src/Core/Main/ColorPalette.cs                      |    1 +
 src/Core/Main/Game.cs                              |    2 +-
 src/Core/Main/Verbal/Analogies.cs                  |    1 -
 src/Core/Main/Verbal/AnalogiesMultipleOptions.cs   |    5 -----
 .../Main/Verbal/AnalogiesPairOfWordsCompare.cs     |    2 --
 .../Main/Verbal/AnalogiesPairOfWordsOptions.cs     |    1 -
 src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs    |    2 --
 src/Core/Main/Xml/DrawingObject.cs                 |    2 --
 src/Core/Main/Xml/GameXml.cs                       |    2 --
 src/Core/Main/Xml/GameXmlDefinition.cs             |    1 -
 src/Core/Main/Xml/GameXmlDefinitionVariant.cs      |    1 -
 src/Core/Main/Xml/GameXmlDrawing.cs                |    1 -
 src/Core/Main/Xml/ImageDrawingObject.cs            |    2 --
 src/Core/Main/Xml/OptionDrawingObject.cs           |    1 -
 src/Core/Main/Xml/TextDrawingObject.cs             |    2 --
 src/Games/Calculation/CalculationFractions.cs      |    1 -
 .../Calculation/CalculationGreatestDivisor.cs      |    1 -
 src/Games/Calculation/CalculationOperator.cs       |    1 -
 src/Games/Calculation/CalculationPrimes.cs         |    1 -
 src/Games/Calculation/CalculationProportions.cs    |    3 +--
 src/Games/Calculation/CalculationRatio.cs          |    1 -
 src/Games/Calculation/CalculationTwoNumbers.cs     |    1 -
 src/Games/Logic/Puzzle3DCube.cs                    |    1 -
 src/Games/Logic/PuzzleBalance.cs                   |    2 +-
 src/Games/Logic/PuzzleBuildTriangle.cs             |    1 -
 src/Games/Logic/PuzzleCirclesSquare.cs             |    3 ---
 src/Games/Logic/PuzzleClocks.cs                    |    1 -
 src/Games/Logic/PuzzleCountCircles.cs              |    3 ---
 src/Games/Logic/PuzzlePredicateLogic.cs            |    2 --
 src/Games/Logic/PuzzleQuadrilaterals.cs            |    2 --
 src/Games/Logic/PuzzleRelatedNumbers.cs            |    1 -
 src/Games/Logic/PuzzleSquareSheets.cs              |    4 ++--
 src/Games/Logic/PuzzleSquares.cs                   |    1 -
 src/Games/Logic/PuzzleSquaresAndLetters.cs         |    1 -
 src/Games/Logic/PuzzleTetris.cs                    |    3 +--
 src/Games/Logic/PuzzleTimeNow.cs                   |    1 -
 src/Games/Logic/PuzzleTrains.cs                    |    3 +--
 src/Games/Logic/PuzzleTriangles.cs                 |    3 +--
 src/Games/Logic/PuzzleTrianglesWithNumbers.cs      |    1 -
 src/Games/Memory/MemoryColouredFigures.cs          |    1 -
 src/Games/Memory/MemoryColouredText.cs             |    1 -
 src/Games/Memory/MemoryCountDots.cs                |    1 -
 src/Games/Memory/MemoryFacts.cs                    |    1 -
 src/Games/Memory/MemoryFigures.cs                  |   13 ++++++-------
 src/Games/Memory/MemoryFiguresAndText.cs           |   13 ++++++-------
 src/Games/Memory/MemoryFiguresNumbers.cs           |    1 -
 src/Games/Memory/MemoryWords.cs                    |    2 --
 tests/Core/AnalogiesFactoryTest.cs                 |    1 -
 tests/Core/GameAnswerTest.cs                       |    1 -
 51 files changed, 21 insertions(+), 84 deletions(-)
---
diff --git a/src/Clients/Classical/Dialogs/PdfExportDialog.cs b/src/Clients/Classical/Dialogs/PdfExportDialog.cs
index 3b3ba32..45ca341 100644
--- a/src/Clients/Classical/Dialogs/PdfExportDialog.cs
+++ b/src/Clients/Classical/Dialogs/PdfExportDialog.cs
@@ -18,7 +18,6 @@
  */
 
 using System;
-using System.IO;
 using Gtk;
 using Mono.Unix;
 
diff --git a/src/Clients/WebForms/package.sh b/src/Clients/WebForms/package.sh
old mode 100755
new mode 100644
diff --git a/src/Core/Libraries/TranslationsCatalog.cs b/src/Core/Libraries/TranslationsCatalog.cs
index 1f36da0..b83f4b1 100644
--- a/src/Core/Libraries/TranslationsCatalog.cs
+++ b/src/Core/Libraries/TranslationsCatalog.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using Mono.Unix;
 
 using gbrainy.Core.Services;
diff --git a/src/Core/Main/ColorPalette.cs b/src/Core/Main/ColorPalette.cs
index 646d2e3..49d455f 100644
--- a/src/Core/Main/ColorPalette.cs
+++ b/src/Core/Main/ColorPalette.cs
@@ -52,6 +52,7 @@ namespace gbrainy.Core.Main
 		{
 			this.translations = translations;
 			alpha = 1;
+			LoadColorArrays ();
 		}
 
 		void LoadColorArrays ()
diff --git a/src/Core/Main/Game.cs b/src/Core/Main/Game.cs
index c3c04d7..536a9fe 100644
--- a/src/Core/Main/Game.cs
+++ b/src/Core/Main/Game.cs
@@ -35,7 +35,7 @@ namespace gbrainy.Core.Main
 		private bool preview;
 		private GameDifficulty difficulty;
 		private ISynchronizeInvoke synchronize;
-		private List <Toolkit.Container> containers;
+		private readonly List <Toolkit.Container> containers;
 		private int variant;
 		private GameAnswer answer;
 
diff --git a/src/Core/Main/Verbal/Analogies.cs b/src/Core/Main/Verbal/Analogies.cs
index 0296ca1..e59d697 100644
--- a/src/Core/Main/Verbal/Analogies.cs
+++ b/src/Core/Main/Verbal/Analogies.cs
@@ -21,7 +21,6 @@ using System;
 using System.Collections.Generic;
 
 using gbrainy.Core.Libraries;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Core.Main.Verbal
 {
diff --git a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
index 129645f..06ec68c 100644
--- a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
@@ -18,14 +18,9 @@
  */
 
 using System;
-using System.IO;
 using System.Collections.Generic;
 
-using Cairo;
-
-using gbrainy.Core.Libraries;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Core.Main.Verbal
 {
diff --git a/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs b/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
index aea32c4..6f8b039 100644
--- a/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
+++ b/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
@@ -20,8 +20,6 @@
 using System;
 using System.Collections.Generic;
 
-using gbrainy.Core.Services;
-
 namespace gbrainy.Core.Main.Verbal
 {
 	public class AnalogiesPairOfWordsCompare : Analogies
diff --git a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
index c73f1f6..8630409 100644
--- a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
@@ -21,7 +21,6 @@ using System;
 using System.Collections.Generic;
 
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Core.Main.Verbal
 {
diff --git a/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs b/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
index 915c32a..5e4ed18 100644
--- a/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
+++ b/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
@@ -20,8 +20,6 @@
 using System;
 using System.Collections.Generic;
 
-using gbrainy.Core.Services;
-
 namespace gbrainy.Core.Main.Verbal
 {
 	public class AnalogiesQuestionAnswer : Analogies
diff --git a/src/Core/Main/Xml/DrawingObject.cs b/src/Core/Main/Xml/DrawingObject.cs
index 303fe66..f2ad2b2 100644
--- a/src/Core/Main/Xml/DrawingObject.cs
+++ b/src/Core/Main/Xml/DrawingObject.cs
@@ -17,8 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
-
 namespace gbrainy.Core.Main.Xml
 {
 	public class DrawingObject
diff --git a/src/Core/Main/Xml/GameXml.cs b/src/Core/Main/Xml/GameXml.cs
index df36fbf..a623c0a 100644
--- a/src/Core/Main/Xml/GameXml.cs
+++ b/src/Core/Main/Xml/GameXml.cs
@@ -19,10 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.RegularExpressions;
 
-using gbrainy.Core.Toolkit;
 using gbrainy.Core.Services;
 
 namespace gbrainy.Core.Main.Xml
diff --git a/src/Core/Main/Xml/GameXmlDefinition.cs b/src/Core/Main/Xml/GameXmlDefinition.cs
index ffd2d5c..22188e4 100644
--- a/src/Core/Main/Xml/GameXmlDefinition.cs
+++ b/src/Core/Main/Xml/GameXmlDefinition.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using System.Text;
 using System.Collections.Generic;
 
diff --git a/src/Core/Main/Xml/GameXmlDefinitionVariant.cs b/src/Core/Main/Xml/GameXmlDefinitionVariant.cs
index 259869e..5abb23d 100644
--- a/src/Core/Main/Xml/GameXmlDefinitionVariant.cs
+++ b/src/Core/Main/Xml/GameXmlDefinitionVariant.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using System.Text;
 using System.Collections.Generic;
 
diff --git a/src/Core/Main/Xml/GameXmlDrawing.cs b/src/Core/Main/Xml/GameXmlDrawing.cs
index 69904c5..69c0341 100644
--- a/src/Core/Main/Xml/GameXmlDrawing.cs
+++ b/src/Core/Main/Xml/GameXmlDrawing.cs
@@ -20,7 +20,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.RegularExpressions;
 
 using gbrainy.Core.Toolkit;
 using gbrainy.Core.Services;
diff --git a/src/Core/Main/Xml/ImageDrawingObject.cs b/src/Core/Main/Xml/ImageDrawingObject.cs
index 8f4015f..7127396 100644
--- a/src/Core/Main/Xml/ImageDrawingObject.cs
+++ b/src/Core/Main/Xml/ImageDrawingObject.cs
@@ -17,8 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
-
 namespace gbrainy.Core.Main.Xml
 {
 	public class ImageDrawingObject : DrawingObject
diff --git a/src/Core/Main/Xml/OptionDrawingObject.cs b/src/Core/Main/Xml/OptionDrawingObject.cs
index b7c9838..ae4c14f 100644
--- a/src/Core/Main/Xml/OptionDrawingObject.cs
+++ b/src/Core/Main/Xml/OptionDrawingObject.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using System.Collections.Generic;
 
 namespace gbrainy.Core.Main.Xml
diff --git a/src/Core/Main/Xml/TextDrawingObject.cs b/src/Core/Main/Xml/TextDrawingObject.cs
index bbf5a13..e7d6b80 100644
--- a/src/Core/Main/Xml/TextDrawingObject.cs
+++ b/src/Core/Main/Xml/TextDrawingObject.cs
@@ -17,8 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
-
 namespace gbrainy.Core.Main.Xml
 {
 	public class TextDrawingObject : DrawingObject
diff --git a/src/Games/Calculation/CalculationFractions.cs b/src/Games/Calculation/CalculationFractions.cs
index efa8b00..c115677 100644
--- a/src/Games/Calculation/CalculationFractions.cs
+++ b/src/Games/Calculation/CalculationFractions.cs
@@ -21,7 +21,6 @@ using System;
 using System.Linq;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Calculation/CalculationGreatestDivisor.cs b/src/Games/Calculation/CalculationGreatestDivisor.cs
index ded81cb..499eabb 100644
--- a/src/Games/Calculation/CalculationGreatestDivisor.cs
+++ b/src/Games/Calculation/CalculationGreatestDivisor.cs
@@ -21,7 +21,6 @@ using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Calculation/CalculationOperator.cs b/src/Games/Calculation/CalculationOperator.cs
index b8bf736..4e0f2bf 100644
--- a/src/Games/Calculation/CalculationOperator.cs
+++ b/src/Games/Calculation/CalculationOperator.cs
@@ -21,7 +21,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Calculation/CalculationPrimes.cs b/src/Games/Calculation/CalculationPrimes.cs
index 1c8fbfb..b77aeb3 100644
--- a/src/Games/Calculation/CalculationPrimes.cs
+++ b/src/Games/Calculation/CalculationPrimes.cs
@@ -21,7 +21,6 @@ using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Calculation/CalculationProportions.cs b/src/Games/Calculation/CalculationProportions.cs
index 3088c7a..0956129 100644
--- a/src/Games/Calculation/CalculationProportions.cs
+++ b/src/Games/Calculation/CalculationProportions.cs
@@ -21,7 +21,6 @@ using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
@@ -80,7 +79,7 @@ namespace gbrainy.Games.Calculation
 			options [options_next++] = correct;
 			options [options_next++] = percentage / 70d * num / den;
 			options [options_next++] = percentage / 120d * num / den;
-			options [options_next++] = percentage / 150d * num / den;
+			options [options_next] = percentage / 150d * num / den;
 
 			random_indices = new ArrayListIndicesRandom (options_cnt);
 			random_indices.Initialize ();
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index 22b2f3e..25c941b 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Calculation/CalculationTwoNumbers.cs b/src/Games/Calculation/CalculationTwoNumbers.cs
index 44f7a79..d33b686 100644
--- a/src/Games/Calculation/CalculationTwoNumbers.cs
+++ b/src/Games/Calculation/CalculationTwoNumbers.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Calculation
 {
diff --git a/src/Games/Logic/Puzzle3DCube.cs b/src/Games/Logic/Puzzle3DCube.cs
index b981286..20a0d1a 100644
--- a/src/Games/Logic/Puzzle3DCube.cs
+++ b/src/Games/Logic/Puzzle3DCube.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleBalance.cs b/src/Games/Logic/PuzzleBalance.cs
index 4be831b..5e36283 100644
--- a/src/Games/Logic/PuzzleBalance.cs
+++ b/src/Games/Logic/PuzzleBalance.cs
@@ -20,7 +20,7 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
+
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleBuildTriangle.cs b/src/Games/Logic/PuzzleBuildTriangle.cs
index 8660641..0041ae0 100644
--- a/src/Games/Logic/PuzzleBuildTriangle.cs
+++ b/src/Games/Logic/PuzzleBuildTriangle.cs
@@ -21,7 +21,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleCirclesSquare.cs b/src/Games/Logic/PuzzleCirclesSquare.cs
index 749b4c2..d8e1fc5 100644
--- a/src/Games/Logic/PuzzleCirclesSquare.cs
+++ b/src/Games/Logic/PuzzleCirclesSquare.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
@@ -78,8 +77,6 @@ namespace gbrainy.Games.Logic
 			gr.ShowPangoText (translations.GetString ("8 units"));
 			gr.Stroke ();
 
-
-
 			//  ---
 			//	 |
 			//	 |
diff --git a/src/Games/Logic/PuzzleClocks.cs b/src/Games/Logic/PuzzleClocks.cs
index c1d1bfe..945bc52 100644
--- a/src/Games/Logic/PuzzleClocks.cs
+++ b/src/Games/Logic/PuzzleClocks.cs
@@ -21,7 +21,6 @@ using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleCountCircles.cs b/src/Games/Logic/PuzzleCountCircles.cs
index ae6169a..a9a564c 100644
--- a/src/Games/Logic/PuzzleCountCircles.cs
+++ b/src/Games/Logic/PuzzleCountCircles.cs
@@ -20,14 +20,11 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
 	public class PuzzleCountCircles : Game
 	{
-		private const double figure_size = 0.3;
-		private const double radian = Math.PI / 180;
 		private int n_circles;
 
 		class ItemCircle
diff --git a/src/Games/Logic/PuzzleCube.cs b/src/Games/Logic/PuzzleCube.cs
old mode 100755
new mode 100644
diff --git a/src/Games/Logic/PuzzlePredicateLogic.cs b/src/Games/Logic/PuzzlePredicateLogic.cs
index 8404dc7..293e5d6 100644
--- a/src/Games/Logic/PuzzlePredicateLogic.cs
+++ b/src/Games/Logic/PuzzlePredicateLogic.cs
@@ -17,12 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleQuadrilaterals.cs b/src/Games/Logic/PuzzleQuadrilaterals.cs
index 4637203..ef47b98 100644
--- a/src/Games/Logic/PuzzleQuadrilaterals.cs
+++ b/src/Games/Logic/PuzzleQuadrilaterals.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
@@ -129,7 +128,6 @@ namespace gbrainy.Games.Logic
 			}
 
 			gr.Stroke ();
-
 		}
 
 		public override void Draw (CairoContextEx gr, int area_width, int area_height, bool rtl)
diff --git a/src/Games/Logic/PuzzleRelatedNumbers.cs b/src/Games/Logic/PuzzleRelatedNumbers.cs
index c92e1a6..8b34a39 100644
--- a/src/Games/Logic/PuzzleRelatedNumbers.cs
+++ b/src/Games/Logic/PuzzleRelatedNumbers.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleSquareSheets.cs b/src/Games/Logic/PuzzleSquareSheets.cs
index a7e7ec4..bc6fe1b 100644
--- a/src/Games/Logic/PuzzleSquareSheets.cs
+++ b/src/Games/Logic/PuzzleSquareSheets.cs
@@ -18,7 +18,6 @@
  */
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
@@ -50,7 +49,8 @@ namespace gbrainy.Games.Logic
 
 		public override void Draw (CairoContextEx gr, int area_width, int area_height, bool rtl)
 		{
-			double x = DrawAreaX + 0.2, y = DrawAreaY + 0.2, width = 0.4, height = 0.4;
+			double x = DrawAreaX + 0.2, y = DrawAreaY + 0.2;
+			const double width = 0.4, height = 0.4;
 
 			base.Draw (gr, area_width, area_height, rtl);
 
diff --git a/src/Games/Logic/PuzzleSquares.cs b/src/Games/Logic/PuzzleSquares.cs
index ca8586e..eb82cbf 100644
--- a/src/Games/Logic/PuzzleSquares.cs
+++ b/src/Games/Logic/PuzzleSquares.cs
@@ -18,7 +18,6 @@
  */
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleSquaresAndLetters.cs b/src/Games/Logic/PuzzleSquaresAndLetters.cs
index 5fafcfa..39594ca 100644
--- a/src/Games/Logic/PuzzleSquaresAndLetters.cs
+++ b/src/Games/Logic/PuzzleSquaresAndLetters.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleTetris.cs b/src/Games/Logic/PuzzleTetris.cs
index 969efac..d2a83cb 100644
--- a/src/Games/Logic/PuzzleTetris.cs
+++ b/src/Games/Logic/PuzzleTetris.cs
@@ -21,7 +21,6 @@ using System;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
@@ -57,7 +56,7 @@ namespace gbrainy.Games.Logic
 			random_indices_answers.Initialize ();
 
 			for (int i = 0; i < random_indices_answers.Count; i++) {
-				if ((int) random_indices_answers [i] == 0) {
+				if (random_indices_answers [i] == 0) {
 					Answer.SetMultiOptionAnswer (i, Answer.GetFigureName (i));
 					break;
 				}
diff --git a/src/Games/Logic/PuzzleTimeNow.cs b/src/Games/Logic/PuzzleTimeNow.cs
index ea4dbf3..835062c 100644
--- a/src/Games/Logic/PuzzleTimeNow.cs
+++ b/src/Games/Logic/PuzzleTimeNow.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleTrains.cs b/src/Games/Logic/PuzzleTrains.cs
index 44dd154..0e9a539 100644
--- a/src/Games/Logic/PuzzleTrains.cs
+++ b/src/Games/Logic/PuzzleTrains.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
@@ -78,7 +77,7 @@ namespace gbrainy.Games.Logic
 				question = String.Format (
 					// Translators:
 					//  - mph (miles per hour). You must localize this using the right unit of speed for your locale
-					/// - The translated string should not use more characters than the original sentence
+					// - The translated string should not use more characters than the original sentence
 					translations.GetPluralString ("A train leaves the station traveling at {0} mph. {1} hour later a second train leaves the station traveling in the same direction at {2} mph. How many hours since the first train left does it take the second train to overtake the first train?",
 						"A train leaves the station traveling at {0} mph. {1} hours later a second train leaves the station traveling in the same direction at {2} mph. How many hours since the first train left does it take the second train to overtake the first train?", (int) hours),
 						speed_a, hours, speed_b);
diff --git a/src/Games/Logic/PuzzleTriangles.cs b/src/Games/Logic/PuzzleTriangles.cs
index ffcf423..82f5f08 100644
--- a/src/Games/Logic/PuzzleTriangles.cs
+++ b/src/Games/Logic/PuzzleTriangles.cs
@@ -17,11 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
+
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Logic/PuzzleTrianglesWithNumbers.cs b/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
index 09bf767..516d577 100644
--- a/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
+++ b/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Logic
 {
diff --git a/src/Games/Memory/MemoryColouredFigures.cs b/src/Games/Memory/MemoryColouredFigures.cs
index 6579396..e5cbec6 100644
--- a/src/Games/Memory/MemoryColouredFigures.cs
+++ b/src/Games/Memory/MemoryColouredFigures.cs
@@ -22,7 +22,6 @@ using Cairo;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/src/Games/Memory/MemoryColouredText.cs b/src/Games/Memory/MemoryColouredText.cs
index b4b5dc0..e7e576a 100644
--- a/src/Games/Memory/MemoryColouredText.cs
+++ b/src/Games/Memory/MemoryColouredText.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/src/Games/Memory/MemoryCountDots.cs b/src/Games/Memory/MemoryCountDots.cs
index bb45b24..2ebc6a2 100644
--- a/src/Games/Memory/MemoryCountDots.cs
+++ b/src/Games/Memory/MemoryCountDots.cs
@@ -21,7 +21,6 @@ using System;
 using Cairo;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/src/Games/Memory/MemoryFacts.cs b/src/Games/Memory/MemoryFacts.cs
index 67af4ad..cda8442 100644
--- a/src/Games/Memory/MemoryFacts.cs
+++ b/src/Games/Memory/MemoryFacts.cs
@@ -20,7 +20,6 @@
 using System;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/src/Games/Memory/MemoryFigures.cs b/src/Games/Memory/MemoryFigures.cs
index c146e52..cd49ea0 100644
--- a/src/Games/Memory/MemoryFigures.cs
+++ b/src/Games/Memory/MemoryFigures.cs
@@ -22,7 +22,6 @@ using Cairo;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
@@ -156,26 +155,26 @@ namespace gbrainy.Games.Memory
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, 1);
 
 			if (Answer.Draw ==  true) {
-				DrawAllFigures (gr, start_x_ans, start_y, area_width, area_height);
+				DrawAllFigures (gr, start_x_ans, start_y);
 				return;
 			}
 
-			DrawGrid (gr, start_x_ans, start_y, area_width, area_height);
+			DrawGrid (gr, start_x_ans, start_y);
 			base.DrawPossibleAnswers (gr, area_width, area_height, rtl);
 		}
 
 		public override void DrawObjectToMemorize (CairoContextEx gr, int area_width, int area_height, bool rtl)
 		{
 			base.DrawObjectToMemorize (gr, area_width, area_height, rtl);
-			DrawAllFigures (gr, start_x_ques, start_y, area_width, area_height);
+			DrawAllFigures (gr, start_x_ques, start_y);
 		}
 
-		private void DrawAllFigures (CairoContextEx gr, double x, double y, int area_width, int area_height)
+		private void DrawAllFigures (CairoContextEx gr, double x, double y)
 		{
 			int col = 1, fig;
 			double org_x = x;
 
-			DrawGrid (gr, x, y, area_width, area_height);
+			DrawGrid (gr, x, y);
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, alpha);
 			for (int figure = 0; figure < figures.Count; figure++, col++)
 			{
@@ -247,7 +246,7 @@ namespace gbrainy.Games.Memory
 			}
 		}
 
-		private void DrawGrid (CairoContextEx gr, double x, double y, int area_width, int area_height)
+		private void DrawGrid (CairoContextEx gr, double x, double y)
 		{
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, alpha);
 			for (int column = 0; column < columns; column++) {
diff --git a/src/Games/Memory/MemoryFiguresAndText.cs b/src/Games/Memory/MemoryFiguresAndText.cs
index badd381..7fef4a5 100644
--- a/src/Games/Memory/MemoryFiguresAndText.cs
+++ b/src/Games/Memory/MemoryFiguresAndText.cs
@@ -21,7 +21,6 @@ using System;
 using Cairo;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
@@ -119,7 +118,7 @@ namespace gbrainy.Games.Memory
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, 1);
 
 			if (Answer.Draw ==  true) {
-				DrawAllFigures (gr, start_x_ans, start_y, area_width, area_height);
+				DrawAllFigures (gr, start_x_ans, start_y);
 				return;
 			}
 
@@ -145,19 +144,19 @@ namespace gbrainy.Games.Memory
 		public override void DrawObjectToMemorize (CairoContextEx gr, int area_width, int area_height, bool rtl)
 		{
 			base.DrawObjectToMemorize (gr, area_width, area_height, rtl);
-			DrawAllFigures (gr, start_x_ques, start_y, area_width, area_height);
+			DrawAllFigures (gr, start_x_ques, start_y);
 		}
 
-		void DrawAllFigures (CairoContextEx gr, double x, double y, int area_width, int area_height)
+		void DrawAllFigures (CairoContextEx gr, double x, double y)
 		{
 			int col = 1, fig;
 			double org_x = x;
 
-			DrawGrid (gr, x, y, area_width, area_height);
+			DrawGrid (gr, x, y);
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, alpha);
 			for (int figure = 0; figure < figures.Length; figure++, col++)
 			{
-				fig = (int)figures[figure];
+				fig = figures[figure];
 				if (fig >= FigureType.Total)
 					fig -= FigureType.Total;
 
@@ -200,7 +199,7 @@ namespace gbrainy.Games.Memory
 			}
 		}
 
-		void DrawGrid (CairoContextEx gr, double x, double y, int area_width, int area_height)
+		void DrawGrid (CairoContextEx gr, double x, double y)
 		{
 			gr.Color = new Color (DefaultDrawingColor.R, DefaultDrawingColor.G, DefaultDrawingColor.B, alpha);
 			for (int column = 0; column < columns; column++) {
diff --git a/src/Games/Memory/MemoryFiguresNumbers.cs b/src/Games/Memory/MemoryFiguresNumbers.cs
index 0962b56..93a8c9d 100644
--- a/src/Games/Memory/MemoryFiguresNumbers.cs
+++ b/src/Games/Memory/MemoryFiguresNumbers.cs
@@ -22,7 +22,6 @@ using Cairo;
 
 using gbrainy.Core.Main;
 using gbrainy.Core.Toolkit;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/src/Games/Memory/MemoryWords.cs b/src/Games/Memory/MemoryWords.cs
index 254a7fb..73b845d 100644
--- a/src/Games/Memory/MemoryWords.cs
+++ b/src/Games/Memory/MemoryWords.cs
@@ -17,11 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using System.Collections.Generic;
 
 using gbrainy.Core.Main;
-using gbrainy.Core.Services;
 
 namespace gbrainy.Games.Memory
 {
diff --git a/tests/Core/AnalogiesFactoryTest.cs b/tests/Core/AnalogiesFactoryTest.cs
index 219c265..661604a 100644
--- a/tests/Core/AnalogiesFactoryTest.cs
+++ b/tests/Core/AnalogiesFactoryTest.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 
diff --git a/tests/Core/GameAnswerTest.cs b/tests/Core/GameAnswerTest.cs
index 94274d2..759029f 100644
--- a/tests/Core/GameAnswerTest.cs
+++ b/tests/Core/GameAnswerTest.cs
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using System;
 using NUnit.Framework;
 
 using gbrainy.Core.Main;