Connection Refactor

- Cleanup
- Sign and then Encrypt dummy