Cleaned up connectionrules catalog