BRANCH 4.1: removed test code left in
Merge branch '4.1' of https://github.com/Southpaw-TACTIC/TACTIC into 4.1