removed generic classes.