Removed former classes