STY: Cleanup