CCGeometry - Dropping legacy code. Also modified Width and Height struct variables.