removed more deprecated objects/components