Clean ups in preparation for Tom's full commit