removed ISDRestraint and swiched to kernel::Restraint
fix warnings