Code cleanup, part 5