Remove unnecessary function
Update type of render functions