Code Cleanup

Change-Id: Ide8c298f4f336c79c9f7919643f92c257a268dcd