Final cleanup/check of case tactic implementation