Remove unused OpPaintThebesBuffer
sorting out buffer types
merged