cleaned up - removed out commented code