More site-wide cleanup

See commits for details.