[Removed] some obsolete object types

Change-Id: Ica3dd17340780b97eaba5756525c1197303f1872