removed dead code
more code cleanup