Removed now obsolete classes due to ItemMeta