Clean up 16x16 style 4