Remove hard dependency to EEAContentTypes