Some more code cleaning after debug compilation messages