Merge pull request #153 from COPPER-BOBCAT/staging

Staging
got rid of commented out code
Merge pull request #154 from power9/master

cleared out comments