more cleanup
remove Pool