removed dead code
code cleanup