Minor cleanups to remove debug statements...