Remove unused code
Make pool values unique.