diff --git a/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacade.java
index 8e79380c0c61a470352c9ac31cb5936c342698eb..68f5cda413592d6f4c2647942e21816de4d45df5 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacade.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacade.java
@@ -19,6 +19,4 @@ public interface FlightFacade<K> {
     List<FlightDto> findAll();
 
     void deleteById(K id);
-
-    void deleteAll();
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacadeImpl.java b/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacadeImpl.java
index f0c8acdab45e674e21ef0dcb8d824bce46cdb6f5..30f3e888e0cdcd57834709e2d58d57cd4a508c9e 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacadeImpl.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/facade/flight/FlightFacadeImpl.java
@@ -54,16 +54,21 @@ public class FlightFacadeImpl implements FlightFacade<Long> {
 
     @Override
     public List<FlightDto> findAll() {
-        return null;
-    }
+        var foundFlights = flightService.findAll();
+        var flightDtos = foundFlights
+                .stream()
+                .map(flightMapper::toDto)
+                .toList();
 
-    @Override
-    public void deleteById(Long id) {
+        for (var i = 0; i < foundFlights.size(); i++) {
+            flightDtos.get(i).setStewards(mapStewardDtos(foundFlights.get(i)));
+        }
 
+        return flightDtos;
     }
 
     @Override
-    public void deleteAll() {
-
+    public void deleteById(Long id) {
+        flightService.deleteById(id);
     }
 }
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/rest/FlightController.java b/core/src/main/java/cz/muni/fi/pa165/core/rest/FlightController.java
index e95efbdf08b0759ecc82930f089090947f534300..5c7aee629c8a10b3403b10f95ae5c83e61ee78bf 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/rest/FlightController.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/rest/FlightController.java
@@ -45,7 +45,8 @@ public class FlightController implements FlightApiDelegate {
      */
     @Override
     public ResponseEntity<Void> deleteFlight(Long id) {
-        return FlightApiDelegate.super.deleteFlight(id);
+        flightFacade.deleteById(id);
+        return null;
     }
 
     /**
@@ -57,7 +58,7 @@ public class FlightController implements FlightApiDelegate {
      */
     @Override
     public ResponseEntity<List<FlightDto>> getAllFlights() {
-        return FlightApiDelegate.super.getAllFlights();
+        return ResponseEntity.ok(flightFacade.findAll());
     }
 
     /**