Clean up after our experience commands. Fixes #1324