Cleanup code in the 6.0.2 module