SWORD1: Remove dead code