Cleanup of the byteorder patch