Getting rid of the bundled modules