More renderer simplifying