Clean up data correctly in deactivatioin

This fixes a bug that typos break subsequent completions. :octocat: