Various cleanup operations, site-wide

See individual commits for details