DB-785 cleanup