removed some dead code
use simple names in fqns