feature/reduce-deps