Remove non-useful ADDRESS option