Removed more debug references.