removed superfulous code and comments.  updated TODOs