[BACKLOG-503] Clean up data access