Removed dependencies from IDTO