some comment cleanup, removed old commented out code