Continuing consolidation and clean-up...