Merge pull request #1 from Tech-XCorp/master

Changes to make compatible with latest Elemental
Remove a couple of commented out lines of code.