removed unused variable (compiler warning) and dead code