cleaned up obsolete commenting