Some image cleanup