Clean up of Data-Access