Refactors to use pcl-1.7