Remove custom toJSON methods only temporarily