Final cleanup commit.