removed old comments and debugging code