Clean source

Change-Id: I26b223b213a96b4007625929b27d23faf2b6fe04