Clean up Image class