Use newer version of rendering models
Clean imports