Tidying up codebase deps
...