TODOs update, removing old persistence adapters