Removed some impl classes.