Remove dependency on Knox