Removed some dead code and improved comments/documntation.

No match.