Revert "Further Cleaning"

This reverts commit bbcc28a4ec5e88c6d547ec47c311de1a3299c2c4.
Merge branch 'master' of https://github.com/RITAccess/IECS