cihai: clean up.