Revert ""Adding missing files""

This reverts commit cc918b80e372bdfa2f48a6cefff29a7fd1adeabf.
Revert ""Problem with tmp file""

This reverts commit b4ec3940e49f01245a2b07f7f62a0e73bb39f495.