Marc: Deleted useles class