span-pool: cleanup and remove dead code.