Removed Java Server specific code