All images work, and some code cleanup. Our job here is done