cleaning house

Change-Id: I5b7c245970b22a7404f0286fa762d89a71088cff