STY: cleanup