patches: update clean up static registration