Revert "More work on book data form."