Removing the temp dir and copy logic, not sure that it is needed