Remove dependency on unrelated gems