Code cleaning for module clone