Utility functions have been moved out to Utils. Minor opportunity to drop the header where not needed.