heavy handed cleanup of the adapter