Also remove all references to commonware and nuggets.