refactor image names, remove unused images, see #20