CrazySquads: some more changes (removed dublicate code)