Removing unused data stream code