Refactors calling of unload() to use the same behaviour as bootstrap()