Png import cleanup