Better settings handling for nn_images
nn_training cleanup