More Cleanup

Removed comments related to what would now be source control.  Few
files moved to centralized error reporting.