nut: some cleanup