remove gateways()
Merge branch 'hotfix/0.7'