Remove dependency on System.Everything