Some code cleaning for the current version