fix up setup
removed dead code