Connect & Messages + Some cleanups