Continuing to clean up environment/initialisation