Brief cleanup for all providers