Don't pass in a static class property when it can be read where its needed.
Remove commented out function
Merge branch 'uconn-1' into EliminatePassdown
Merge pull request #5371 from Wikia/EliminatePassdown

Eliminate unecessary passdown of class constant