Big scrub

Change-Id: I6926ecd95ef8cbdd14ae77c484e18b4b5885f126