Cleaned up client code that was being used on the server. Various other fixes.