Revert "Basic server classes updated."

This reverts commit 81f98d7aecf2817864b7a3f2be890d29a3ba295d.