Cleaning Up
Fixing Data Check
Merge branch 'feature/CleanUp' into develop
Removing debugging headers
Merge branch 'feature/CleanUp' into develop