i see dead code
minors