Removed unsed items from ConstraintProfile and further work on attribute constraints