took out commented out things