Removing legacy code. (nw)