Move run -rm to the cli only

Ping @creack