General cleanup of variables
Adds hub config