Cleanup cli