Removed redundant unused variables on a few spots