Clean up transitivity functions