Revert "Added regn and type to JSON"

This reverts commit 0f3a8de4f26fcfcb0f4d736ec8590ff29c8693b6.
Revert "Fixed typedef"

This reverts commit b43a9f339567bd8d7445a64a25da3ee756be5499.