removed generic type dependencies from ContentElement
removed generic type from class and all usages