Added all extra images and cleanup db