Removed inner classes.