cleanup
merge from 1.1