Cleanup, part 2