Cleaned up autoconnect