clean up zpool and fix #5114