Remove outdated, disabled code.
merge trunk