Cleanup for the CLI