* replaced a few _s which are not inferable anymore.
* removed some accidentally added /agdai files