Took out commented code