More^2 cleanup.