Standardize, remove constraints.h. Moved into policy.h