Removing unused Server class