Images: Remove trim--query removes stuff for us.