Clean the code to avoir warnings