1) Eliminate Old mains() that aren't needed anymore.
1) Clean up the servlet registration stuff, resource registrations on CliHistorical weren't working, they do now.