remove unused code
merge trunk