Removing some dependencies from Rg