minor updates, removing unused variables