Code simplification et methode use for debug deleted