Update based on code review.  Removed code not applicable to add