General cleanup - part 2.