remove unused code
merge trunk
doc improvements