Minor -- dropped unnecessary classes.