Added code for cross-cleaning