remove some unneeded code that was added today
Lots of small changes and some additions