Remove legacy 16-bit workarounds