Cleanup and Fix

Change-Id: Ifcbb8f76b796cdfa07b4201fd126c8f0f9c42c7d