Drone class + cleanup