More cleaning & smaller images