refactoring + remove doc support