Remove DRY