Merge branch 'remove-images'