taking out commented code