removed unused defs