more cleanup in main cmd and prevent special cases where a message might not show