removed old "xaddr_scape" which wasn't really and who's function could be achieve via the semantic tree