Code Cleanup

Change-Id: Ia89372e63973285becd91b7fc5925e660da22a45