Remove pwd dependency