Work around AI stalling problem, some code cleanup

To properly fix this problem a "scene changed" event would be required which allows the internal AI states to be reset before a new match begins