Remove cruft z variable from caculateAngle()