Removed unused server portions