removed the last of the deprecated/unused/duplicate classes.