Remove remaining address space related code