clean up shim/add-on interface