More code clean up, removed unused variable