Clean up connection variables

\approve @marius

Merge request reports

Loading