Cleaning up container module