Revert "[JH] - Removing files."

This reverts commit 82e9b0ec1e236fcb76bdad5f28e634b83a4c1c8b.
Revert "Revert "[JH] - Removing files.""

This reverts commit 43d166b233b884c5797fe0fa2e7c4ab2f99cd0f6.