Simplify dependencies