remove TODO comments.

Are you catching all possible exceptions?