Snow Leopard: Clean dependencies refactoring