Pool cleanups, readd wait for TCP