Further removal of leftover code (nw)