Extension cleanups