Remove left over ElementCollection code.