Removed client-only references