ImageView elements properly remove.

Also starting to make this work again, previous updates have seemingly
broke it.