Improving how adapter is disposed #CINT-182