Code Cleanup

Change-Id: I3468ce71eab51f1668c9eb69ff9b9240b7a6dafd