removed some defs