Data request administration improvements

Any reason to keep these commented out lines?