Remove unneeded images, tweaks