(#1907) - Make adapters responsible for cleaning their own data