contrib updates
cleanup