Remove some unneeded repos, move one to just the module that needs it, add a defaultGoal