Removed lots of extra code and functions.  This stuff will return later, though in different places.
Removed lots of extra code and functions.  This stuff will return later, though in different places.

OverByThere/modern,OverByThere/modern,OverByThere/modern,omonar/modern,omonar/modern,omonar/modern