Start commenting server.rb in prep for rewrite

Also clean up other files and references to s9s in the files