FIX: Some leftovers + csit_sut image sync