remove todos which got done by our awesome backend team!
make "doc" optional in assert