more code cleanup & removed auto-reconnect optionality