More incremental optimization on cleanUp():