Clean up Point and PointTracker