cleaning up with latest spritebatch changes