Some more core cleanup (nw)