Code cleanup, batch 1.