General code cleanup for the site. No framework changes.