Clean Up

Change-Id: I062548c1b51caee0ee59e39cc5339a8da8cb154c