Remove import of map
Remove 'team' variable from Unit.
Add callbacks class, deals with canonical ids and such