EAGLESIX-3144 Removed toJSON