fixing cherry-picking
cleanup after cherry picking