Implement cleanPoints and associated helpers