Removed traces and cleaned up.  Clarified Todo