remove only
add error if this branch his hit
cleanup