Code Cleanup

Change-Id: I828a08b26b5c5538c4fae3924ec350f17062638d