book update
fix trace statement
remove unused defines