Cleanup + Fix parse error at the start of each connect