Cleanup

removed unused variables from various pieces of code.