Removed UserInfo and InfoMarshaller