remove some junk and set for cavity flow
add cavity cases