code clean-up.  submission release candidate.