Cleaned up commitments