removed some useless defs