Remove extra dir creation