Removed unused items from schema and tidied up schema
Removed unused utility classes for Master FaveList