took out commented code