Cleanup. Removed old comment render functions