Add missing swap16 for SCAC, make comments more accurate, remove dead code