Clean responsibly

13063548-cleanResponsibly