staging: dgap: remove two unnecessary conditionals