Worked on RaidInCombat detect.
Cleanup.