general clean out of code that is not strictly client-server