Remove unusual include and format connection_cb