removing unnecessary render functions
merge