Cleanup Code

Change-Id: I1ac63c91955b70b72368303a12a7ef46aae20b03