Cleanup implementation of partial order