Removed a bunch of this. crud
A LOT of clean up!