Import apt version 2.3.8
 code cleaning