Remove references to x1 y1, simply x and y