Images tidy develop

This effectively rebases #440 but with an additional commit to remove 2 images which are used on dev_4_4 but not develop.

Again, a successful build indicates all used images are still present.