cleanup and fixes related to Data access