diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp
index 712574989..a9ba79a33 100644
--- a/Demos/OpenGL/DemoApplication.cpp
+++ b/Demos/OpenGL/DemoApplication.cpp
@@ -217,16 +217,9 @@ void DemoApplication::updateCamera() {
 	btScalar aspect;
 	btVector3 extents;
 
-	if (m_glutScreenWidth > m_glutScreenHeight) 
-	{
-		aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
-		extents.setValue(aspect * 1.0f, 1.0f,0);
-	} else 
-	{
-		aspect = m_glutScreenHeight / (btScalar)m_glutScreenWidth;
-		extents.setValue(1.0f, aspect*1.f,0);
-	}
-
+	aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
+	extents.setValue(aspect * 1.0f, 1.0f,0);
+	
 	
 	if (m_ortho)
 	{
@@ -245,15 +238,8 @@ void DemoApplication::updateCamera() {
 		//glTranslatef(100,210,0);
 	} else
 	{
-		if (m_glutScreenWidth > m_glutScreenHeight) 
-		{
-//			glFrustum (-aspect, aspect, -1.0, 1.0, 1.0, 10000.0);
-			glFrustum (-aspect * m_frustumZNear, aspect * m_frustumZNear, -m_frustumZNear, m_frustumZNear, m_frustumZNear, m_frustumZFar);
-		} else 
-		{
-//			glFrustum (-1.0, 1.0, -aspect, aspect, 1.0, 10000.0);
-			glFrustum (-aspect * m_frustumZNear, aspect * m_frustumZNear, -m_frustumZNear, m_frustumZNear, m_frustumZNear, m_frustumZFar);
-		}
+//		glFrustum (-aspect, aspect, -1.0, 1.0, 1.0, 10000.0);
+		glFrustum (-aspect * m_frustumZNear, aspect * m_frustumZNear, -m_frustumZNear, m_frustumZNear, m_frustumZNear, m_frustumZFar);
 		glMatrixMode(GL_MODELVIEW);
 		glLoadIdentity();
 		gluLookAt(m_cameraPosition[0], m_cameraPosition[1], m_cameraPosition[2], 
@@ -598,15 +584,8 @@ btVector3	DemoApplication::getRayTo(int x,int y)
 
 		btScalar aspect;
 		btVector3 extents;
-		if (m_glutScreenWidth > m_glutScreenHeight) 
-		{
-			aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
-			extents.setValue(aspect * 1.0f, 1.0f,0);
-		} else 
-		{
-			aspect = m_glutScreenHeight / (btScalar)m_glutScreenWidth;
-			extents.setValue(1.0f, aspect*1.f,0);
-		}
+		aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
+		extents.setValue(aspect * 1.0f, 1.0f,0);
 		
 		extents *= m_cameraDistance;
 		btVector3 lower = m_cameraTargetPosition - extents;
@@ -649,16 +628,9 @@ btVector3	DemoApplication::getRayTo(int x,int y)
 
 	btScalar aspect;
 	
-	if (m_glutScreenWidth > m_glutScreenHeight) 
-	{
-		aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
-		
-		hor*=aspect;
-	} else 
-	{
-		aspect = m_glutScreenHeight / (btScalar)m_glutScreenWidth;
-		vertical*=aspect;
-	}
+	aspect = m_glutScreenWidth / (btScalar)m_glutScreenHeight;
+	
+	hor*=aspect;
 
 
 	btVector3 rayToCenter = rayFrom + rayForward;