DOUG-v5 cleanup (completed)