trivial: Remove some added categories
Do not error-out when a package changes architecture