[kuroneko] further clean-up