fixed issue with removeAll Fleets
some refactoring