Revert "Removed file references that are unused"

This reverts commit a5e16f2b15a2b20893ec867d5699a4ec6eaf7d60.
Revert "Removed code redundencies"

This reverts commit 668278a97985f391136a1737706985d004c7deaa.
Deleted in error