Clean up to get rid of all processing of offset and count.