Better initialisation and cleaning, where we wait for ongoing operations