Revert "Several code enhancements"
Merge pull request #531 from AppliedEnergistics/revert-509-e-improvements

Revert "Several code enhancements"