Remove a few comments and move the comment commands up to below the todonotes package inclusion.