removing a completely unneeded function
removing another completely pointless function
removed unused var
removed more warning and some pointless vars
missed a function def
merge
Merge pull request #373 from jrossi/unused-cleanup

My Old code cleanup