cleanup non-primitive word definitions