Clean up cmd interface