Removing unnecessary binary streaming