Remove optional units from package