Clean up of comments and removal of a broken piece of test code that no longer works...