third-party clean up wip