Clean up connection variables

Felix Delattre requested to merge feature/cleanup-variables into master

\approve @marius

Merge request reports