Really remove iCore support