Minor fixes. Removed commented out code