[Improved] Ensure that we have a very simple library