Wide scope clean up