Revert "Simon Files"

This reverts commit 3f255140b4731f5e25aaecdce18053c9fc26b952.
Simon version should work
Revert "Simon version should work"

This reverts commit 505c9817027b2d72c113ccb5a5de7f50a446d6ba.