armada has been sunset-ed so lets remove