Automating adapters cleanup