star: cleanup star related codes - part two