Get rid of unused code
Fix renders