Fixed compiler warning for shadowing local variables
Commented out deprected methods to fix compiler warning