[WIP] Fix/remove embedded doc complexity