Cleaning code, images configuration are now better handled with the new default values.