Removed old Shape overrides and using GL_TRIANGLE_STRIP