Maintance:
* Cleanup some commented out code