Less use of pools
Remove some use of FS logging macros