removed unnecessay defs