rm dead conditional check
add test