more cleanup in rules-model.