Remove middleman images

Change-Id: I9c27b1e60d0a7686b1dc8f82b522c5c1c949afd3