ICF returns Constraint objects only
remove unused code
AbstractVariable extends Variable (no more type param)

add annotations
fixedVar and setvar delta refactoring
Merge branch 'feature-ref' into develop