Issue #73 - Clean up partial calls