fixup! Corrected one comment.
Removed the package mapping from repository (now it's a set of package ids).
Refactored package trimming to embrace this change.