Clean things up, if only the APIs worked as expected