Revert "Add Index generation, change primary key gen"

This reverts commit b0afa9b0429db82d89e0a8b163a62057a232ad1e.