Removed windows rectangle and ellipse dependency