Snow Leopard: Clean dependencies refactoring (2)