Cleanup after massive API breakage