removed some more unneeded code

I have eliminated some more code that I did not need/was not using.
Still trying to figure out how to handle 'traveling' and then after that
beta push should be good to go.