Integrate PlaneScanner
clean up