Small core cleanup (nw)