BS-2327, clean persistence dependencies