- Removed the hardcoded default addresses.