removed old out commented code