PP-6 + PP-7: remove the outside call to adapt() since it was causing trouble, and clean up after the mathing adapt() calls.