Neha, Shruthi | Removing address hierarchy from default-config