Fixed remove image from library function
Fixed merge conflicts