more disabled code removal
merge trunk