TGriffin clean up