Code clean up of the fix from yesterday night