Remove Screen references from Point