Removed unused old classes in Content Manager