staging: dgap: use remove function