CONN-74:clean-up gateway.properties