Formatted and removed deprecated classes.