removed some legacy includes that are not valid (nw)