A lot of code cleanup. Mostly remove unused "Use" statements. But also fixed a few bugs, and cleaned up unused variables.
Merge pull request #126 from Ryan-Myers/Code_Cleanup_foldor

A lot of code cleanup.