reduce depends of chatlog / tests
refactor / reduce includes