Add a not complete solution for InCircularConstraint
Removed old code
Updated the Constraint Interface