Removed classes that are not required any more.
Updated ObjectFactory class (from CM codebase)