Further cleanup of dead wood and some minor cross package class movements.