removed and changed classes