diff --git a/engines/grim/costume.cpp b/engines/grim/costume.cpp
index e460ea1b7b2..5516c38d19f 100644
--- a/engines/grim/costume.cpp
+++ b/engines/grim/costume.cpp
@@ -439,7 +439,6 @@ void Costume::getBoundingBox(int *x1, int *y1, int *x2, int *y2) {
 			c->getBoundingBox(x1, y1, x2, y2);
 		}
 
-		//TODO: why is it lowercase 'mesh'? 
 		if (_components[i] &&(_components[i]->isComponentType('m','e','s','h'))) {
 			EMIMeshComponent *c = static_cast<EMIMeshComponent *>(_components[i]);
 			c->getBoundingBox(x1, y1, x2, y2);
diff --git a/engines/grim/emi/costume/emimesh_component.cpp b/engines/grim/emi/costume/emimesh_component.cpp
index 9686bd90559..a0d4651a25f 100644
--- a/engines/grim/emi/costume/emimesh_component.cpp
+++ b/engines/grim/emi/costume/emimesh_component.cpp
@@ -87,7 +87,7 @@ void EMIMeshComponent::draw() {
 	//translateObject(true);
 }
 
-void EMIMeshComponent::getBoundingBox(int *x1, int *y1, int *x2, int *y2) {
+void EMIMeshComponent::getBoundingBox(int *x1, int *y1, int *x2, int *y2) const {
 	// If the object was drawn by being a component
 	// of it's parent then don't draw it
 
diff --git a/engines/grim/emi/costume/emimesh_component.h b/engines/grim/emi/costume/emimesh_component.h
index 4ded3c1e70f..7b45eda84db 100644
--- a/engines/grim/emi/costume/emimesh_component.h
+++ b/engines/grim/emi/costume/emimesh_component.h
@@ -37,7 +37,7 @@ public:
 	int update(uint time);
 	void reset();
 	void draw();
-	void getBoundingBox(int *x1, int *y1, int *x2, int *y2);
+	void getBoundingBox(int *x1, int *y1, int *x2, int *y2) const;
 
 public:
 	bool _hierShared;
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index 8a0e4a1dbf0..9b501aa685d 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -442,13 +442,7 @@ void GfxOpenGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
 		return;
 	}
 	
-	//*x1 = (int)left;
-	//*y1 = (int)top;
-	//*x2 = (int)right;
-	//*y2 = (int)bottom;
-
-	//TODO: For some reasons the x axis needs to be flipped to get the correct positioned texts?
-	*x1 = (int)left;
+    *x1 = (int)left;
 	*y1 = (int)(_gameHeight - bottom);
 	*x2 = (int)right;
 	*y2 = (int)(_gameHeight - top);
diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
index a004ac25217..3aae2ff60b7 100644
--- a/engines/grim/gfx_tinygl.cpp
+++ b/engines/grim/gfx_tinygl.cpp
@@ -575,12 +575,6 @@ void GfxTinyGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
 		return;
 	}
 	
-	//*x1 = (int)left;
-	//*y1 = (int)top;
-	//*x2 = (int)right;
-	//*y2 = (int)bottom;
-	
-	//TODO: For some reasons the x axis needs to be flipped to get the correct positioned texts?
 	*x1 = (int)left;
 	*y1 = (int)(_gameHeight - bottom);
 	*x2 = (int)right;