Remove postal code and Add postal code id to addresses