More image cleanup