Book file updates, mostly cleanup