STY: Cleanup info defs