cleaning got api with new rendering model