Revert "Code cleanup and bug fixing"

This reverts commit 1f4c9bcfb54dd0f216927fe3886df785582e1559.
Merge pull request #67 from junmendoza/StabilizeBranch21

Revert code cleanup that caused a few regressions in Language