Deleted classes Added finishing touches