Re-sharper: clean up