Clean up auto connect and launcher