cleaned out commented code