Cleaning up PCL support