removed some excess commented code