cleanup and start of rework of data buffer status functions