Clean up code

Change-Id: Ibf517ae0a5757c52d8ebb2704378bfcac8839155