Cleanup command calls