Documentation/code review

removed some unnecessary code, flagged some other for removal.