Delete renamed/moved/unused classes.

These weren't included in the last commit.