Work on advanced tools and cleanup of image folder