Remove addressing redundancy