Cleanup API wrapper