Removed the concept of a "pool".
More refactoring