how to reuse existing solution with has more than 5 entities for Ribbon workbench

Good day!

I have some questions for ribbon workbench. We have a solution for ribbons with more than 10 entities. Before Ribbon Workbench update, they were uploaded into Ribbon Workbench successfully. But after Ribbon workbench update (latest version), this solution couldn’t be uploaded into Ribbon workbench and Ribbon workbench showed a message which said only allowed max 5 entities in a solution.

Right now I don’t know how to update my current existing ribbon solution now. 

Can I delete some entities from this existing solution which is in PROD as unmanaged solution? After deleting some entities, do their ribbons still work?

Or

Should I create a new ribbon solution with only 5 entities (or less – depend on our requirement) for future requirement?  Should I deploy the small solution as managed or unmanaged into PRODUCTION?

In the future,  we could have ribbon change for different entities.  Can I delete existing entities from the small ribbon solution and add new entities? 

Thanks for your help!