STY: Clean up cruft