changed a method for collecting all IDs from the declUseMap
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup