[adaptor] Final cleanup