Remove NotNullConstraint and methods