Removed helper functions in the header.