Remove unused variables and fix automatic nat to alias-address