Removed the Format class