Clean-ups: Dependencies, versions, etc.