more image cleanup